this should not be needed anymore after your latest changes.