Fixed issues in #426