2.01.1:zeress:18 Fix for #76