this should solve #3