disabled old bug workaround - doesnt seem needed anymore