Swing frame fix
Added comparable pair