More fix for issue 313 & 314