FIXES: #440 minor