Temp solution ..still an issue there ...