added a silly hack to deal with cleanup