Fixed bug with setup on options