Quickfix for NullPointerException