closes SPARK-1566 - thanks Tomas Hruska