FIXES: #493,#494