Fix previous commit #28