merge requests #488, #498