Hopefully fixed stuff