Possibly fix issues 413, 414, and 415