Fixing this non-sense