Lets hope this fixes the closing issue >.> (Works in dev environment)