Bugfix, should call options