previous fix was actually not working, should be ok now