Fixes Issues #231