fixed when issue