Implemented fix for real this time