Fix for but #1