tried to resolved issue51