fixed #16 to invoke correct constructor when switching screens