Rebuilt fixes to bug #2