Fixes #314
Fixes #318
Release v2.3.3