merged nolan's fix to deckhead
fixed merge