Fixing @czardoz 's mess-up ;)