Fixes #67
Fixed #287