Fixes: #1828 Fixed problems in argonaut