Fixed Nicolas Hack