Fixed code for real!