Implementation issues. #390