Features - Fixed small bug