Try to fix strange bug in production