Ticked #46: Solved bug