Removed ActionSelection workaround