Adding small bug fix before I merge into dev