temporary solution to #1