Hopefully fixed bug.