Fixes NPE with #34