super hack to make this work... :(