Fixed #288 [gh#288]