2D Toolkit Fix Attempt #2