Fix possible bug
Bugfix #294