closed #319
closed #320