fixes issue8