Removed a temp fix