Fixed small bug in modular approach