remove hacky way - thanks hekel