Fixing it a bit