Possible fixes for GitHub Issues #23, #24, #25