implements comments for #319