KimSia Sim
fixed bugs for report under issue 148 #enpvqp