Trying to fix an issue with handmade classes