Fix issue 313 & 314