fix/Temp fix for bug #28