Tweak as discussed on #79