Attempted fix for issues in previous fix

#6