fixed a mess