temporary #25 fix, must be improved