Fixing things soon