Temporal fix for extra commit spam due to bug