Custom generation fixed