Bug fix #475
Bug fix #484
Bug fix #471