Issue: #240 - Fixing issues