Fixing ugly behaviour