fixed a bug where Jonas could crash the system