Issue #361 - Use the correct option property