FIXES: #407 minor