Removed temp fix to bug