fixed issues 7916 and 7915