current fix
complete merge