BugFix: issue#187

Signed-off-by: Euhow <euhowzy@gmail.com>