Fix for issue ticket: #1