Completed fix for bug 144