fixed for the other shapes