Potential error source, doesn't fix #43