Trying markup suggestion from issue #46