Fix http://projects.andriylesyuk.com/issues/2326