Hopefully fixed bug now