One last Mouestrap change