Old bug was introduced again - Fixed