hopefully fixed a bug