Fix ship selection bug. #14 #21

* Removed patchwork fix. It shouldn't be a problem anymore.