Fixed API for @micdoodle8