Quickfix of broken code