quick fix of the quick fix of david charette :D