Fixed build for classic