Fixed #58, Fixed #59, Checksummen 3.2.11, 3.3.2