Includes fix from https://github.com/charliesome