Fix for short option