maybe #156 would help here?