Fixing john's commit