#81 Revised fix for constructor validation

As suggested by @krzyk. :)