OpenCSD: Bugfix patch pushed to opencsd-0v003 branch