Issue 474

@DinisCruz @MichaelHidalgo Try: http://tm-kofi.azurewebsites.net/

Please confirm this now behaves properly?