Fix #309 - Fixed issue