FIXES: #454 minor