fix issue # #12