fixed for regular build