[#485] Put back endif