Deploy of #11 fix