updated with feature #276