Okay, issue fixed for real this time!