Finally no more aparent bugs