Fix for Drawback