refs #631 - Fixed code for WS generation.