Hopefully fixing prior issues