Hopefully fixed bug