Added a dirty hack oh well..