Fix #577 Hopefully...