Changed some round switch logic - fix #4