FIX: Errors in previous fix