Removed temp fix