Fixed cardboard bugs