#1599 Added spec