closes SPARK-1534 - thanks Tomas Hruska