Issue#376 & #313