Issue: #444 - Fixing bug