Working on solving issue