FIX: Previous fix now works for ships