Bug fix for Ship button