Bug fixes

Fixed 'double required' bug