more fixes for dumb implementation