good idea. Fixing