#348 - Fixed bug