Resolved #381 again by removing more respond_to blocks