#15 Quickfix for runtime exception