Apply suggestion from stefanbirkner