fixed a dirty problem in a dirty way