Fixed bug preventing correct implementation of several options