Fixed issue 127 & 128