added hack for bug, pending to fix