Quick hack to fix this up for latest amazon ui changes