Hopefully fixed issues