Hopefully fixed a problem