Fixes: #454, #321