added 1516
fixes
simplification