Merged @ynkdir's patch