Updated to try and fix hiding