Issue #269 - Fix tempo modal