Subject: Fixed

From: Dima Kogan <[email-masked]>
Date: Tue, 31 Jan 2017 00:05:05 -0800

I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d