Works properly now...