Fixing it really this time