Fix on #272
Fix on #272