Hopefully fixed a bug