Dynamic Option Bugfix