Fixed connections bug