Fixing some behavior